forked from hmislk/hmis
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathpatch_file.diff
More file actions
239 lines (186 loc) · 8.67 KB
/
Copy pathpatch_file.diff
File metadata and controls
239 lines (186 loc) · 8.67 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
<<<<<<< SEARCH
private void pharmacyCancelBillItemsAddStock(CancelledBill can) {
for (BillItem nB : getBill().getBillItems()) {
BillItem b = new BillItem();
b.setBill(can);
b.copy(nB);
b.invertValue(nB);
if (can.getBillType() == BillType.PharmacyGrnBill || can.getBillType() == BillType.PharmacyGrnReturn) {
b.setReferanceBillItem(nB.getReferanceBillItem());
} else {
b.setReferanceBillItem(nB);
}
b.setCreatedAt(new Date());
b.setCreater(getSessionController().getLoggedUser());
PharmaceuticalBillItem ph = new PharmaceuticalBillItem();
ph.copy(nB.getPharmaceuticalBillItem());
ph.invertValue(nB.getPharmaceuticalBillItem());
if (ph.getId() == null) {
getPharmaceuticalBillItemFacade().create(ph);
}
b.setPharmaceuticalBillItem(ph);
if (b.getId() == null) {
getBillItemFacede().create(b);
}
ph.setBillItem(b);
getPharmaceuticalBillItemFacade().edit(ph);
// updateRemainingQty(nB);
// b.setPharmaceuticalBillItem(b.getReferanceBillItem().getPharmaceuticalBillItem());
double qty = ph.getFreeQtyInUnit() + ph.getQtyInUnit();
//System.err.println("Updating QTY " + qty);
getPharmacyBean().addToStock(ph.getStock(),
Math.abs(qty),
ph, getSessionController().getDepartment());
getBillItemFacede().edit(b);
can.getBillItems().add(b);
}
getBillFacade().edit(can);
}
private void pharmacyCancelBillItemsAddStock(CancelledBill can, Payment p) {
for (BillItem nB : getBill().getBillItems()) {
BillItem b = new BillItem();
b.setBill(can);
b.copy(nB);
b.invertValue(nB);
if (can.getBillType() == BillType.PharmacyGrnBill || can.getBillType() == BillType.PharmacyGrnReturn) {
b.setReferanceBillItem(nB.getReferanceBillItem());
} else {
b.setReferanceBillItem(nB);
}
b.setCreatedAt(new Date());
b.setCreater(getSessionController().getLoggedUser());
PharmaceuticalBillItem ph = new PharmaceuticalBillItem();
ph.copy(nB.getPharmaceuticalBillItem());
ph.invertValue(nB.getPharmaceuticalBillItem());
if (ph.getId() == null) {
getPharmaceuticalBillItemFacade().create(ph);
}
b.setPharmaceuticalBillItem(ph);
if (b.getId() == null) {
getBillItemFacede().create(b);
}
ph.setBillItem(b);
getPharmaceuticalBillItemFacade().edit(ph);
// updateRemainingQty(nB);
// b.setPharmaceuticalBillItem(b.getReferanceBillItem().getPharmaceuticalBillItem());
double qty = ph.getFreeQtyInUnit() + ph.getQtyInUnit();
//System.err.println("Updating QTY " + qty);
getPharmacyBean().addToStock(ph.getStock(),
Math.abs(qty),
ph, getSessionController().getDepartment());
getBillItemFacede().edit(b);
//get billfees from using cancel billItem
String sql = "Select bf From BillFee bf where bf.retired=false and bf.billItem.id=" + nB.getId();
List<BillFee> tmp = getBillFeeFacade().findByJpql(sql);
cancelBillFee(can, b, tmp);
//create BillFeePayments For cancel
sql = "Select bf From BillFee bf where bf.retired=false and bf.billItem.id=" + b.getId();
List<BillFee> tmpC = getBillFeeFacade().findByJpql(sql);
// calculateBillfeePaymentsForCancelRefundBill(tmpC, p);
//
can.getBillItems().add(b);
}
getBillFacade().edit(can);
}
=======
private void pharmacyCancelBillItemsAddStock(CancelledBill can) {
List<PharmaceuticalBillItem> phsToBatch = new ArrayList<>();
List<BillItem> bsToBatch = new ArrayList<>();
for (BillItem nB : getBill().getBillItems()) {
BillItem b = new BillItem();
b.setBill(can);
b.copy(nB);
b.invertValue(nB);
if (can.getBillType() == BillType.PharmacyGrnBill || can.getBillType() == BillType.PharmacyGrnReturn) {
b.setReferanceBillItem(nB.getReferanceBillItem());
} else {
b.setReferanceBillItem(nB);
}
b.setCreatedAt(new Date());
b.setCreater(getSessionController().getLoggedUser());
PharmaceuticalBillItem ph = new PharmaceuticalBillItem();
ph.copy(nB.getPharmaceuticalBillItem());
ph.invertValue(nB.getPharmaceuticalBillItem());
// Create entities and immediately flush to database to generate IDs
// This is required because getPharmacyBean().addToStock depends on persisted entities
if (ph.getId() == null) {
getPharmaceuticalBillItemFacade().createAndFlush(ph);
}
b.setPharmaceuticalBillItem(ph);
if (b.getId() == null) {
getBillItemFacede().createAndFlush(b);
}
ph.setBillItem(b);
phsToBatch.add(ph);
double qty = ph.getFreeQtyInUnit() + ph.getQtyInUnit();
getPharmacyBean().addToStock(ph.getStock(),
Math.abs(qty),
ph, getSessionController().getDepartment());
bsToBatch.add(b);
can.getBillItems().add(b);
}
getPharmaceuticalBillItemFacade().batchEdit(phsToBatch);
getBillItemFacede().batchEdit(bsToBatch);
getBillFacade().edit(can);
}
private void pharmacyCancelBillItemsAddStock(CancelledBill can, Payment p) {
List<Long> billItemIds = new ArrayList<>();
for (BillItem nB : getBill().getBillItems()) {
if (nB.getId() != null) {
billItemIds.add(nB.getId());
}
}
Map<Long, List<BillFee>> billFeesMap = new HashMap<>();
if (!billItemIds.isEmpty()) {
String sql = "Select bf From BillFee bf where bf.retired=false and bf.billItem.id IN :ids";
Map<String, Object> m = new HashMap<>();
m.put("ids", billItemIds);
List<BillFee> allBillFees = getBillFeeFacade().findByJpql(sql, m);
for (BillFee bf : allBillFees) {
if (bf.getBillItem() != null && bf.getBillItem().getId() != null) {
billFeesMap.computeIfAbsent(bf.getBillItem().getId(), k -> new ArrayList<>()).add(bf);
}
}
}
List<PharmaceuticalBillItem> phsToBatch = new ArrayList<>();
List<BillItem> bsToBatch = new ArrayList<>();
for (BillItem nB : getBill().getBillItems()) {
BillItem b = new BillItem();
b.setBill(can);
b.copy(nB);
b.invertValue(nB);
if (can.getBillType() == BillType.PharmacyGrnBill || can.getBillType() == BillType.PharmacyGrnReturn) {
b.setReferanceBillItem(nB.getReferanceBillItem());
} else {
b.setReferanceBillItem(nB);
}
b.setCreatedAt(new Date());
b.setCreater(getSessionController().getLoggedUser());
PharmaceuticalBillItem ph = new PharmaceuticalBillItem();
ph.copy(nB.getPharmaceuticalBillItem());
ph.invertValue(nB.getPharmaceuticalBillItem());
// Create entities and immediately flush to database to generate IDs
// This is required because getPharmacyBean().addToStock depends on persisted entities
if (ph.getId() == null) {
getPharmaceuticalBillItemFacade().createAndFlush(ph);
}
b.setPharmaceuticalBillItem(ph);
if (b.getId() == null) {
getBillItemFacede().createAndFlush(b);
}
ph.setBillItem(b);
phsToBatch.add(ph);
double qty = ph.getFreeQtyInUnit() + ph.getQtyInUnit();
getPharmacyBean().addToStock(ph.getStock(),
Math.abs(qty),
ph, getSessionController().getDepartment());
bsToBatch.add(b);
List<BillFee> tmp = billFeesMap.getOrDefault(nB.getId(), new ArrayList<>());
cancelBillFee(can, b, tmp);
can.getBillItems().add(b);
}
getPharmaceuticalBillItemFacade().batchEdit(phsToBatch);
getBillItemFacede().batchEdit(bsToBatch);
getBillFacade().edit(can);
}
>>>>>>> REPLACE